Merge "RESTRICT AUTOMERGE Verify a Map size mismatch in Parcel#writeMapInternal causes an exception" into oreo-mr1-cts-dev