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

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

Change-Id: Ibde008c9e9c5786c4b47b3124b67db1e47447c3b