Merge "Merge "[SettingsProvider] make nfc_payment_default_component readable" into sc-dev am: 576c548b am: 22573aa3" into sc-v2-dev-plus-aosp am: b363f87e

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

Change-Id: I04484f34a6162b2cafd23be3de162613251d1699