Merge "DO NOT MERGE - Merge RQ2A.210505.003." am: 60894b7a66

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

Change-Id: I06c9fc0fed49a003d92c12a4205fa62c0f5ac453