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

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

Change-Id: Id4ebbc236b4b8e16a4e7cf5b4c95a63b3e75df43