Merge \"Set hintTextColor and composingSpan style for EditText and extract view\" into nyc-mr1-dev
am: a884aacb47

Change-Id: I3352e1fc4ce0d603ba66eae71aad8e5c88191941