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

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



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