Merge changes from topic "list_releases" into main am: 5219ed0b am: 4c1b3ebc

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



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