Merge "Add separate checks for Tag Reading and Card Emulation is enabled." into main am: 24c9102d0f

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

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