Merge changes Ibb4dad3a,I6eb1ce89 am: 261eac80a5 am: b078796d5e am: 73d6a08534 am: 6ccc50f510

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

Change-Id: If44cc71647e9311180a9d52e0cb4b25cef587053