Merge changes I426dc1f7,I7502f09f am: ec895dd834 am: 3879f37c8e am: 8c7032dfab

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0486e32ebefa2bc0c700d0ec17ad1fc7c86c8101