Merge changes from topic "am-c95828476fd145a2a85d154061b83375" am: 5ec9a17f -s ours

am skip reason: Merged-In I0d02e151b2dcaedcbd2ce8ef30ae883c33efbd43 with SHA-1 10118ef7 is already in history

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



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