Merge changes from topic "presubmit-am-b480a938e1a74bd1a08c92e592efe11e"
* changes:
[automerge] Use enforceCallingOrSelfPermission for ContextHub APIs 2p: ce8499e1 2p: 0d5c63b6
[automerge] Use enforceCallingOrSelfPermission for ContextHub APIs 2p: ce8499e1