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

[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 skip reason: Merged-In I1ab2b7228470f10ec26fe3a608ae540cfc9e9a96 with SHA-1 8c2c7b41 is already in history

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



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