Merge "Check packages/modules before packing otatools keys" am: 2b392dd8 am:...

Merge "Check packages/modules before packing otatools keys" am: 2b392dd8 am: f0a814fa am: b017eb73

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



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