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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If90808b1776648bb40ed108fb02bf7bbeac68c7b