[automerger skipped] Merge changes from topic "nfc_apex_revert" into main am: 4bc515224b am: f94b13f69d am: bfca1a6f59 -s ours

am skip reason: Merged-In Ib09ea604351cea2c4ed40e64c0bf783a666eb08b with SHA-1 09c1ce320b is already in history

Original change: https://android-review.googlesource.com/c/device/google/felix/+/2817310

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