am acf92242: Merge "Make ChooserActivity intents doccentric and transitory"

* commit 'acf922428803d5a6b619254df0daa3a724580970':
  Make ChooserActivity intents doccentric and transitory