Merge "Use enforceCallingOrSelfPermission for ContextHub APIs" into tm-dev