Merge changes Ide01063f,I23847ac7,I5ab97357 am: e91e96ba9a am: 24cd6c17fc am: 03ae550175 am: 2e53a20fea

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

Change-Id: I6e1914e7985e9220f2f4d134bb486c52525c74b6