[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 -s ours am: bed55064 -s ours

am skip reason: Merged-In Icf3cff3690140e3297299d3bb2ce7b9f24dfd791 with SHA-1 092b019c is already in history

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

Change-Id: Ibb6eea624e086bf19c54d066ed62961f8114a3ba