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 am: 2499b960 am: 14549f90 am: e7430bfc

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



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