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

[conflict] Merge "Validate package name passed to setApplicationRestrictions." into qt-dev am: 0b5ceb8c am: 9f864c4b am: ef2a1d60

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



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