[automerger skipped] Merge changes from topic "nfc_apex_revert" into main am: 3ea3148bf7 am: 60ec70c8ac -s ours

am skip reason: Merged-In Ie6d5643f77a828f9a4254edd0ecf4fe28460a2f6 with SHA-1 b5ff2c83d3 is already in history

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

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