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: fe28bfdc

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



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