tree 342f9c41e15e128d71f0e97a08bde082c124cdb6
parent 03a220d6ca033683a4b67afd0b883090e0ae0d7d
parent 9ef0cdbbc37e463d69310b0ef983232f30d074df
author George Chang <georgekgchang@google.com> 1617800990 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1617800990 +0000

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