Merge "Remove stopship for permissioncontroller pkg name" into rvc-dev am: 1fe28b24 am: 0344d952

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

Change-Id: I9c8dfd4ba1a0e97a8581570ed1d065c3e37752b4