tree b63d6819065b00e3ba3d807218f1e57f1471ff26
parent 2e88eb283bf41d66327dfebe9ae257252402a88c
parent aafebf55b81ea5e8ddf806165a4ba57cdca7f374
author Xin Li <delphij@google.com> 1598998223 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598998223 +0000

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: acb4b2d440 -s ours am: 7c3413361b -s ours am: aafebf55b8 -s ours

am skip reason: Change-Id I8d84faf48c0236373fcd6bed3e8355dfb50ddee5 with SHA-1 524bb0d57f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sdm845/media/+/12470130

Change-Id: I6fbd3ae2f8147350c51141effcdbf27469a70a12