Merge "[automerger skipped] Merge "[conflict] [conflict] Merge "Validate...

Merge "[automerger skipped] Merge "[conflict] [conflict] Merge "Validate package name passed to setApplicationRestrictions." into qt-dev am: 0b5ceb8c am: 9f864c4b am: ef2a1d60 am: 043b90b3" into sc-dev am: b62eeefe am: 7a601f8e -s ours am: c89d81e2 -s ours am: 8f8d4940 -s ours am: b4177575 -s ours" into tm-d1-dev-plus-aosp am: 714281c7 -s ours

am skip reason: Merged-In I1ab2b7228470f10ec26fe3a608ae540cfc9e9a96 with SHA-1 cfcfe6ca is already in history

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



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