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

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



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