Merge "Pack the mainline modules test keys into the otatools.zip" am:...

Merge "Pack the mainline modules test keys into the otatools.zip" am: fb5f2de3 am: 504b57de am: 3202a684

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



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