Merge "Fix #62350081 - annotate permission requirements" into oc-dev
am: 42abe82bbb

Change-Id: I3b8415aac86f9dfd6457e5eca7dce904b1bfef7c