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

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



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