Merge changes Icf924186,Iaaed14ac am: d17c6025fc am: 3aa3e30128

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

Change-Id: If278122247520ef79429e6d911efddf4b4de0854