Merge "Revert "Switch framework-permissions to use java_sdk_library"" into rvc-dev