Merge changes Ibb4dad3a,I6eb1ce89 am: 261eac80a5

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

Change-Id: I27bb6bf86c4eb1cf01e336d7c4f0ebf9d505dda1