Merge "TV: Fix infinite mute/unmute cycle on connected AVR" into main am:...

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

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



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