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

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



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