Merge "Avoid p2p priority logic when beam feature is disabled" am: a2c75aa1f1 Original change: https://android-review.googlesource.com/c/platform/system/nfc/+/2033506 Change-Id: I26d7d00ccfc70a44712e3c903bbf23c9909401f9