Merge "[automerger skipped] Merge "RESTRICT AUTOMERGE Verify a Map size mismatch in Parcel#writeMapInternal causes an exception" into oreo-cts-dev am: 88f8349b12  -s ours" into oreo-mr1-cts-dev