[automerger skipped] Merge "[automerger skipped] Merge "RESTRICT AUTOMERGE: Verify a Map size mismatch in Parcel#writeMapInternal causes an exception" into nougat-cts-dev am: 3ad40e526a  -s ours" into nougat-mr1-cts-dev am: 9de114103a  -s ours skipped: 47 skipped: d1bbefd58c

Change-Id: I5095572b76ec28c3746694058a2483bfd355b03a