DO NOT MERGE - Merge RQ2A.210505.003. am: 4b95f99142

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

Change-Id: Ie49f4cabf3d7c6893149822626bd6346cde70c73