Merge "Compat revoke NEARBY_DEVICES permissions for pre-s apps" into sc-dev am: 7f86ee3945 am: 902f6209de am: 2a778a091f

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

Change-Id: Ia5bdfff6f82b1fdd0b96c6937d43ccec85e0ec9c