Merge changes from topic "nfc_api_feedback" into main am: e028c04b15 am: feb0df2762 am: 490b996c59

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

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