Merge "Try to add AppOps Keys into Proto to unblock my project" am: 324ef4ff23 am: 053e5b3d7f

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

Change-Id: I165d4b7e9a2396fd677d2beb435a2da5119c8614