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: f7b58554 am: 4041df66

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



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