Merge "Replace NFC_PAYMENT_COMPONENT with NFC_PAYMENT_DEFAULT_COMPONENT in comment." am: 4f631e337b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib95b8b28971d041c11c9d11d00dfe991567612aa