Merge changes from topic "cherrypicker-L02600000954235185:N86800001257976348"...

Merge changes from topic "cherrypicker-L02600000954235185:N86800001257976348" into tm-dev am: 8b569618

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



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