Merge \"Remove RemoteInput on lockscreen setting\" into nyc-dev
am: 333ba2df01

Change-Id: Ib9419acf4b09dd17fd15b53d32ce4616cbec94fa