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

[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: cf9e7f19 am: 3ffdfd11 -s ours am: 87d5a9a2 -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: Iaa2c59f3d43df90e25350b6d7029c83175a3136d