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

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



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