Merge changes Iaa3f64f7,I890d2e23 am: 7b86ff3552 am: 798580bf0b am: 7740f0f574 am: 609ae48d7a am: e9ad94d319

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

Change-Id: Ic839f67f3dea33cef2eb36ab9f06628a4a13c7a5