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