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: 902b1496 am: 9115668b

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



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