Merge "Merge "Switch service-permissions to java_sdk_library" into rvc-dev am:...

Merge "Merge "Switch service-permissions to java_sdk_library" into rvc-dev am: 5a807e6d am: 1500abdf" into rvc-d1-dev-plus-aosp am: 294dd5c9 am: 0f7b1fc5

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11689589

Change-Id: I808c5f21a292f9f62afd64e1a91a82d8c8234020