Merge changes from topic "am-229c89126c0b4da5ac2b22eeb70ba0d0" am: 1fb8baab -s ours

am skip reason: Merged-In Iba03d8b8c48351a8cc4f2ed3eb2451d649ad8cac with SHA-1 621a28ad is already in history

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



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