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

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



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