Merge "RESTRICT AUTOMERGE Remove exception for Q- apps from app op validation" into udc-dev am: 10b710ab

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



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