Merge "Update ControllerAlwaysOnStateCallback to ControllerAlwaysOnListener" am: 1f9ab469c3 am: abc915c398 am: 52eb1da131

Original change: https://android-review.googlesource.com/c/platform/cts/+/1675848

Change-Id: I8721759be5b1118b8139be0db2cef22aae1cb546