[automerger skipped] Merge "Do not allow non-system apps to provide unverified...

[automerger skipped] Merge "Do not allow non-system apps to provide unverified attributions" into tm-dev am: db187c34 am: 1ada6a28 am: a40ae770 -s ours am: 8277717d -s ours am: 027cb883 -s ours am: 40331577 -s ours

am skip reason: Merged-In I6a7b0a24359097c0ea2f52cc69637d929a931b4f with SHA-1 b645679d is already in history

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



Change-Id: Icb2286cce76c0792b363dda9725efa30a39f87bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>