[automerger skipped] Fixing compiler warnings for PermissionController project...

[automerger skipped] Fixing compiler warnings for PermissionController project am: 142838f6 am: 1f9b49de -s ours

am skip reason: Merged-In Ic1c1098dab6aed52695c31dc6632c38f8e2b0caf with SHA-1 adc3ef39 is already in history

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



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