[automerger skipped] Merge "CEC: Modify Standby Mode Handler" am: 9b73fc72...

[automerger skipped] Merge "CEC: Modify Standby Mode Handler" am: 9b73fc72 am: 5ab1c3fe am: 297fc385 am: d81bcdc5 -s ours

am skip reason: Merged-In Ie00e16231e385db0f2d280f088882d5d0f9a8add with SHA-1 9884f20f is already in history

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

Change-Id: I22a0ac553a9baa945fa0fb17e074d294a55c74c2