Merge changes from topic "nonabrevert" into main am: 80b1a3fc

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



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