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

Merge "Remove stopship for permissioncontroller pkg name" into rvc-dev am: 1fe28b24 am: 2baed048

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

Change-Id: Ieea908678a84e2638f5ae1020a01bcfbf8d963ad