Merge "Add separate checks for Tag Reading and Card Emulation is enabled." into main am: 24c9102d0f am: 3aab8fa617 am: 36a0ba80b6 am: 8a9bd6ff2c am: 6579cbc98a

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

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