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: c7b25612

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

Change-Id: Ib1acc4b4f2a05bb705085c0af16e891ad449bd50