Merge cherrypicks of ['googleplex-android-review.googlesource.com/23245979'] into tm-qpr3-release. am: 95be9bad23

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

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