Merge changes Icf924186,Iaaed14ac am: d17c6025fc am: 3aa3e30128 am: e39561b08c am: 6b24f8cf53

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

Change-Id: I794eb78db7e6235668afb45faa73083113b745c8