Merge cherrypicks of ['googleplex-android-review.googlesource.com/24303963', 'googleplex-android-review.googlesource.com/24303958', 'googleplex-android-review.googlesource.com/24433390'] into udc-release. am: 2c377d34a8

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

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