Merge "Do not allow non-system apps to provide unverified attributions" into...

Merge "Do not allow non-system apps to provide unverified attributions" into tm-dev am: db187c34 am: 1ada6a28

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



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