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: I44bc8d19e6877cbfbf5cf54b9cb9dbcd8db35cd9