Merge changes Ie71caf7b,I45ff708e am: 3850b872e0 am: 0b730f5e10

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

Change-Id: I42746924931fae953b88bc86b8307c8fd11d9347
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>