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

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

Change-Id: I41d3f3483af865653e8feb8a29628a072bb43d16