Merge cherrypicks of [16371866] into sc-platform-release. am: 438129ee49

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/19980707

Change-Id: I818526749bd97b9c80d0a218592b6554aa0edc75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>