Merge "Remove calling UID check from ContentProvider" into sc-dev am: c2c1c0341b am: aadf463f5a

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

Change-Id: I4c385b5e54006778f68a9da1c04f7eba3757d424