[automerger] Merge "DO NOT MERGE: Fix expected error for missing ZIP local header magic." into nougat-mr1-cts-dev am: f2db306ba2  -s ours am: 11d6ab0780

Change-Id: I794f0af45f627845389c8b8dd3749a702c0d2385