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 am: a63afc7a

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

Change-Id: I35357f39effc5b7cbd56f284469cf44d7e156424