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

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

Change-Id: If2e6c2198d04d2699c0fc6afad8c3d935727a674