[automerger skipped] Merge ab/7633965 am: 9441144af9 -s ours

am skip reason: Merged-In I183224a4acc59c40d511ee2eb37da05210851348 with SHA-1 a22028535b is already in history

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

Change-Id: Ib63b91b9076fd66c44e64defae5e080e681690dc