Merge "[conflict] [conflict] Merge "Validate package name passed to...

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

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



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