Merge cherrypicks of ['googleplex-android-review.googlesource.com/24394600'] into udc-release. am: 402dbe885f

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

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