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

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

Change-Id: Icc27b330ac2f4c2208fcdc08322d05cca67cbc8d