Merge "Support converting LOCAL_PROTO_JAVA_OUTPUT_PARAMS" into main am: e317b15cea am: 4aae7c846c

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

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