Merge changes Ibb4dad3a,I6eb1ce89 am: 261eac80a5 am: b078796d5e

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

Change-Id: I58c6048e385a815a08a938a49001f223f7e035c2