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: Ib376ae786de66cb2954d2e9b97774b31387ff4e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>