Merge "Fix copy+paste error" am: 187a6be0 am: aefec234 am: ae4c839e

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



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