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

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

Change-Id: I0613d2c914e53d0f5185b4402debc0eda5e87145