Merge "Prevent app check via content provider." into sc-dev am: 10239a0c am:...

Merge "Prevent app check via content provider." into sc-dev am: 10239a0c am: b476c798 am: d20eb778

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

Change-Id: I8311588ff9e47cb6c1da2b0969278f3adbef2eb9