Merge changes from topic "nonabrevert" into main am: 80b1a3fc38 am: 795ffffd00

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

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