Merge "Annotate @SystemApi with required permissions." into oc-dev