Merge "Fix possible orphaned proto_library targets" into main am: 6a299f7d...

Merge "Fix possible orphaned proto_library targets" into main am: 6a299f7d am: 1c42b34e am: 7e2d4905 am: 1220ef55 am: b1afd137

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



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