Merge "cec: Reset system audio mode status carefully [2/2]" am: ec04d57b am:...

Merge "cec: Reset system audio mode status carefully [2/2]" am: ec04d57b am: 82ef50b0 am: f386b1c3 am: 522bf9e3 am: 78d5f935 am: ac701e47

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



Change-Id: I5dce3dc94667597c83a4be8f81936ca8efadd32e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>