[automerger skipped] Merge "Add attr for nfc applications to configure support...

[automerger skipped] Merge "Add attr for nfc applications to configure support power states" am: 809b2f24 am: 87e9535a am: 73b63e38 -s ours am: 3b35ad2f -s ours

am skip reason: Change-Id I03bd537082117e595a7badfb2d8ca6ee7cae08cf with SHA-1 ad9223f6 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifcd056f1aee506b063dc085ef1d84c6b4b4f5375