[automerger skipped] Merge changes from topic "aosp-ittiam" into sc-dev am:...

[automerger skipped] Merge changes from topic "aosp-ittiam" into sc-dev am: 233a22e1 am: 7ea717b4 -s ours

am skip reason: Merged-In Icf3cff3690140e3297299d3bb2ce7b9f24dfd791 with SHA-1 97e8181c is already in history

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

Change-Id: I4d396dfecb7347cb93e15bb5581854b177f407c1