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