Merge changes from topic "nfc_apex_revert" into main am: 3bb396285d
Original change: https://android-review.googlesource.com/c/device/google/sunfish/+/2816634 Change-Id: I571e1928220b7ec639f691df52d12c61a02655be Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: