Merge "fix protos in another dir + a module that uses it" into main am:...

Merge "fix protos in another dir + a module that uses it" into main am: 34a1c57b am: 7227d2ad am: 73627d5d

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



Change-Id: I7508234bad9b34967f75d1cd5ca7b0e59ad0f359
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>