[automerger skipped] Merge "Try to add AppOps Keys into Proto to unblock my project" into rvc-qpr-dev-plus-aosp am: 18a450a92b -s ours

am skip reason: Change-Id Ibd0f85575c9bc3d7aca9d5b011f1e5f0cbf960c1 with SHA-1 503ee6ad3b is in history

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

Change-Id: Ia8819751a64057d17fac2e3d8d2b1daaa8187886