Merge "Extracting VotesStorage to separate class with local locking" into udc-dev am: 24dcc93d

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



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