[automerger skipped] Merge "RESTRICT AUTOMERGE Remove exception for Q- apps...

[automerger skipped] Merge "RESTRICT AUTOMERGE Remove exception for Q- apps from app op validation" into tm-dev am: 78d60645 am: 805b23bf am: d3ca749d -s ours am: edc863a5 -s ours

am skip reason: contains skip directive

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



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