[automerger skipped] resolve merge conflicts of 22ccf36b to rvc-dev am: 63e1c37e -s ours am: a6463614 -s ours

am skip reason: Change-Id Ic8a8adb3fffb357754384ddbf13684d944a9767e with SHA-1 f037e1a9 is in history

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

Change-Id: Ib8b59dde0d54cfb5ef494925a4a920679b3941a2