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

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

Change-Id: Ib847254e7ccf35aa0050bcb1893fa9924899af97