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 am: 94c90299

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



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