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

Change-Id: I6ed58865c11a8758a3a3204079b4161b7d6f8ad6