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