Merge "Try to add AppOps Keys into Proto to unblock my project" into rvc-qpr-dev-plus-aosp