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

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

Change-Id: Ief837931b5f47192da98dc6363c50c713f39581f