Merge "Fixing race condition between deleting display and updating votes" into udc-dev am: 84471c9738 am: 0c2ac0bb33
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21853339 Change-Id: Iea682c0498987f3e59739673315573effa2b0e06 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: