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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie67885ccdda993939a37dcba94c4cb37312636bd