Merge "Merge "Remove stopship for permissioncontroller pkg name" into rvc-dev...

Merge "Merge "Remove stopship for permissioncontroller pkg name" into rvc-dev am: 1fe28b24 am: 0344d952 am: 55970218" into rvc-qpr-dev-plus-aosp am: 42be7d51

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

Change-Id: I770772b64fee16bbb8ff98cb500ac7ccec97ac92