[automerger skipped] Merge "Merge...

[automerger skipped] Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master am: 54d22a98 -s ours am: bce84384 -s ours am: cbc2fd60 -s ours

am skip reason: Merged-In I46f1b2cd2b169542e6cc7fd2f1327201ec8be052 with SHA-1 f61161e5 is already in history

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

Change-Id: I487726584bdee0855a954f07fb5535524fe7f2d5