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

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

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