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

Change-Id: If3724770b370b83c3de9e30a0c917d4ad1bc72d5