Merge "Merge "Switch service-permissions to java_sdk_library" into rvc-dev am: 5a807e6de3 am: 1500abdf06" into rvc-d1-dev-plus-aosp