Merge "Add a unit test around the flag in ZipFile#onZipEntryAccess()"