Merge "Update register and unregisterControllerAlwaysOnListener" am: 16019ad77d am: 925778283c

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

Change-Id: I6ec902877875a9ccd7c80ecb5ec7986032e38043