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: 2baed048 am: c7b25612" into rvc-qpr-dev-plus-aosp am: be5c92d5

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

Change-Id: If2de93fbcfac94877e9bf4cd7a8698201eef7a3c