Merge "Add callbacks to indicate NFC setControllerAlwaysOn state changed" am: cfc798e793 am: c5e292c9aa am: 9ef0cdbbc3

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

Change-Id: I64403a77aa63acb4cf0b35f6b72e82c518fa8040