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 am: 0d15b385 am: 96e0bd13

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



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