[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent root from getting...

[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent root from getting unverified attributions from non system apps" into tm-dev am: 438cd14b am: 4a29829a am: 3a3c4991 -s ours

am skip reason: contains skip directive

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



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