[automerger skipped] Merge "Merge...

[automerger skipped] Merge "Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855" into stage-aosp-master am: 9c6c0302 -s ours am: 3a7b4afa -s ours

am skip reason: Change-Id I880b5dfb7bfea4b6abef9fcb603abcb383d84f42 with SHA-1 b69cb667 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13122218

Change-Id: Ia8da6087f44345441ea59ee614b2895e18eb773f