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

Change-Id: I015d3019792ecb3e4d788ace36f1ae2c9e4fb4f8