Merge "TV: Fix infinite mute/unmute cycle on connected AVR" into main am: 040e8387 am: 253d9336

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



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