Merge changes I742a9d3d,Idce40ad2 into rvc-dev am: 1928cddbe9 am: b167113505 am: 2f46995e57 am: c81fd37076

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

Change-Id: Ib1a818b87de0ae46daeccc44208f546b810d8abd