Merge "Compat revoke NEARBY_DEVICES permissions for pre-s apps" into sc-dev