Merge "implementation of NFC Reader option" into main am: 8e970db838 am: 10ccc3300a am: e45b140d6c am: 9998571579 am: 2d79dbad26

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

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