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

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

Change-Id: Ie1d4602e0d444df963364f63ddf341c8107812e3