Merge "CEC: Modify Standby Mode Handler" am: 9b73fc72a1 am: 5ab1c3fe67 am: 297fc385d8

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

Change-Id: I052414b08e3b4517fa39e417bbb07df2ff470602