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

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

Change-Id: I018c5bb54973007891b4565b2327a42d15c11918