Merge changes from topic "regress" am: 17fb8e72 am: f840d8b2 am: 73529fc7

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



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