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

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

Change-Id: I520b75a3a8ac6c1a843c5a5274cb5fd952d9b2f0