Merge changes from topic "reverted-mistakenly-tv" into udc-dev am: 77016c93...

Merge changes from topic "reverted-mistakenly-tv" into udc-dev am: 77016c93 am: f7b58554 am: 4041df66 am: b73f4987

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/23088796



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