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

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

Change-Id: I1d33ec195bc8e8509366ffb2d772f0e3ac1ea2d5