[automerger skipped] Merge "Rename generate proto config file to match...

[automerger skipped] Merge "Rename generate proto config file to match classpath type." into sc-dev am: f1adfb38 -s ours am: 2108ba24 -s ours am: 7e45fb1d -s ours

am skip reason: Merged-In I04f4e181d2f42b9d71641980a2c7c4e8cbc8e426 with SHA-1 53d0678b is already in history

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

Change-Id: I2a217a6fc5fb2402685eb3beed00a868864b74cd