Merge "Retry "Switch framework-permissions to use java_sdk_library"" into rvc-dev am: 3c3bf520ff

Change-Id: Ic5e8686e9a9a9af83114a8fd540bb5b3351e9d4b