Merge "Remove ContentResolver binder call from UI thread" into udc-qpr-dev am: 8cc05554

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



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