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 am: 13d916e3

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

Change-Id: I779c0ab1f807dfc35bab5c872ea68d84bbbab083