Merge changes I92f232e9,I955b4ef3 am: 11ac2dfe77 am: 78f3b50bc7

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

Change-Id: Ie26349c0d7fd76775b4597738510f5c1509e0c80