Merge changes from topic "nfc_apex_revert" into main am: 3ea3148bf7

Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2817309

Change-Id: Iffae5bfd6abee081d9d4322a67225cc5efe3bc5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>