[automerger skipped] Merge changes Ic5778d29,I036b1c56 am: 0073246407 am: 6a0a3d4eb1 am: a3ee8bf2e5 -s ours

am skip reason: Merged-In Ic5778d2989a0a1583cfd36a5cc68c50ec404f7ae with SHA-1 bbd9db7ce0 is already in history

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

Change-Id: Ie1661c4f51b7388c725f2948767c675f7da96949