Merge changes from topic "am-a6159419ca3c491faa5a91d61fe283a5" into main am: 103d1b30 -s ours

am skip reason: Merged-In Ia868ea2a74aa56b14f541e47b5d3d2390f266448 with SHA-1 d1146681 is already in history

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



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