[automerger skipped] Merge "Remove @TestApi and @Readable for...

[automerger skipped] Merge "Remove @TestApi and @Readable for NFC_PAYMENT_DEFAULT_COMPONENT" into sc-dev am: 3172fe26 am: 219c8adc -s ours am: 11b6c414 -s ours

am skip reason: Merged-In I13c038753d3acf3f3b651af3cd22ff55cd464cb1 with SHA-1 bf0d8be2 is already in history

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

Change-Id: Id42089b6f55bb50ecafcb7910c9157a35931fba0