[automerger skipped] Fix the missing std am: 8a917b31 am: 1d320173 -s ours

am skip reason: Merged-In Ib7fcc8ed359dff2ede1ba4f4570981be3f3f1079 with SHA-1 54cb525e is already in history

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



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