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

Merge "Merge "Remove calling UID check from ContentProvider" into sc-dev am: c2c1c034 am: aadf463f" into sc-v2-dev-plus-aosp am: 4c7e53d7

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

Change-Id: Icf3dc15d3b85fe9bbb5038f362b3c5386bf521ee