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

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

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



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