[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT...

[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: c9e91554 am: 87c7ea32 -s ours am: 1a796944 -s ours am: 97192328 -s ours

am skip reason: Change-Id I4bbc4aca7e21839ac5afd59cc3a13bf102138dd0 with SHA-1 98cf8dea is in history

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

Change-Id: I0f3f0f6d9b638f3e47ae1478f29272acc65bbca4