[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 am: f26fc1c19e

Change-Id: Id71aac17ad1d9fab37552a7c36cba262e2657af2