[automerger skipped] Require required modules to exist am: 64faf889 am:...

[automerger skipped] Require required modules to exist am: 64faf889 am: b37bb1d8 am: 9bb503ee am: 76b9b7c4 am: 142f7f4a -s ours

am skip reason: Change-Id I5cdc56c7433b7ce15da155993b7100af9af604fa with SHA-1 c6159372 is in history

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

Change-Id: Iff3b5d654e0ea4c8291537c90c29cc772c05b006