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

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

Change-Id: I6488ef52341051e77863a1a0a66f3bf5a7b552cc