[automerger skipped] resolve merge conflicts of...

[automerger skipped] resolve merge conflicts of 87deed46 to rvc-dev am: 925c9f29 -s ours am: 62c3cd90 -s ours am: 2d9f2b04 -s ours am: a3fa0322 -s ours

am skip reason: Change-Id If801d23c431a71eddcf332c100b00eacd97ced5a with SHA-1 f6746c13 is in history

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

Change-Id: I2479e0100ff5056e74c1949dffe1fab3b40b50f2