Merge changes from topic "nfc_apex_revert" into main am: 4bc515224b am: f94b13f69d

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

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