Merge "Fixing race condition between deleting display and updating votes" into...

Merge "Fixing race condition between deleting display and updating votes" into udc-dev am: 84471c97

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21853339



Change-Id: I66d1f7d8e55ea6089085ba007c211b63a678f5ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>