Merge "Merge "Clarified how to set for autofill views representing creditcard expiration dates." into oc-mr1-dev am: daf9b2ee15" into oc-mr1-dev-plus-aosp