[automerger skipped] Merge "Convert the sdk proto genrule to use soong var" am: 5eca3e3d82 -s ours
am skip reason: Merged-In Ifd426ca602c14e7a5c5605622da11c992d0c5c59 with SHA-1 176fab8a9f is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1814163
Change-Id: I290bba3bb3ffe3c69e4464410d237dc0b5f6dd05
This commit is contained in: