resolve merge conflicts of 0afd7070 to rvc-dev am: 43889572 am: 33d23ad2

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6a85ce0dbee744ea06b025704758a4a130c5edae