[automerger skipped] Merge "Add NFC power saving mode" into main am: ff2cabb9b7 am: eb503a7dd9 am: c953c006ff -s ours

am skip reason: Merged-In Id7ebdc0209f282ef6edc78bdfa1890c0cea5f077 with SHA-1 6b6d1b7169 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Nfc/+/2740113

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