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

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

Change-Id: I089d7211f1639929df9643b7686237fa21871015