Fix source incompatibility issues in multiple permission classes

Add fixes to fix the source incompatibility issue

Bug: 272780399
Change-Id: Iaf7825a65d65ad6bc97b1f89e9fe3372e017b5f9
Merged-In: Iaf7825a65d65ad6bc97b1f89e9fe3372e017b5f9
Test: Build
(cherry picked from commit 2d4954494e3056d42aa76c551b8f8f6de241a76c)
10 files changed