tree 3f720d6e711175ec9cc99790ea76da80ac8db79c
parent 036e9e145428f2eeac5b9781876e5d0462ba3d5b
parent a081325972d521d1cf49bb49f1c1f9f6d7903d83
author Roshan Pius <rpius@google.com> 1698157880 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1698157880 +0000

Merge "Revert "Revert "svc(nfc): Use NfcAdapter API to enable/disable""" into main am: 1d98705039 am: a081325972

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2799364

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