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 am: 8d8ec00e

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



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