Merge "Fix issue with acquiring singleton content provider from another user"...

Merge "Fix issue with acquiring singleton content provider from another user" into sc-dev am: a575e65f am: 38f097a4

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

Change-Id: Ie562d1f8e2c625468de3e659d461d8d9915a00d8