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

Merge "Merge "Do not clear REVOKED_COMPAT for pre-S NEARBY_DEVICES" into sc-dev am: 9900f4b2 am: 7d86edcb" into sc-v2-dev-plus-aosp am: 1a0a6a60

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15248112

Change-Id: I7e80f19dabed39395544f2cb1af9779d29e1c822