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

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



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