Merge "RESTRICT AUTOMERGE Prevent root from getting unverified attributions from non system apps" into udc-dev am: a265ad80 am: 5c2112db

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



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