Merge changes I3929bfb6,I4ad6fa07 am: 632056e550

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

Change-Id: I6b370842a284f8a72f475a6ae761bee77c2f933f