Merge "Fix contrast enforcement for RemoteInputView" into nyc-dev am: 7461032
am: 21ee221

* commit '21ee221343deb52c9bce184d08a7fbd1cc70cdca':

Change-Id: Iaf173cc36a0e7705a632bc2ad1d002b378669a27