Merge "Do not clear REVOKED_COMPAT for pre-S NEARBY_DEVICES" into sc-dev