[automerger skipped] Merge "Try to add AppOps Keys into Proto to unblock my project" am: 324ef4ff23 am: 053e5b3d7f am: 6d396415d3 -s ours

am skip reason: Change-Id Ibd0f85575c9bc3d7aca9d5b011f1e5f0cbf960c1 with SHA-1 95e066e793 is in history

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

Change-Id: Ie1cb6bc470771c265b8b6a657a101e6cd4951509