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

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

Change-Id: I54cdb86d024f9c83fe1306a05a99c2fa3cd6f748