Merge "Update RemoteInput#setChoices documentation" into pi-dev am: bef37f23d6
am: f4a2505e3e

Change-Id: I8490319bf518be784fa73902bc4535f22e96727a