Merge changes Icf924186,Iaaed14ac am: d17c6025fc

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

Change-Id: I4279d3e93b2b0e556a6faef46ff0f3473bb6af4b