Merge "Protect android.nfc.action.ALWAYS_ON_STATE_CHANGED" am: c88231bcba am: 77b5d6436c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8a2a7da344ac0c8eeb893b45eb8a16e4b07147c7