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