am d6d7587a: am a0166b58: Merge "Activity chooser "Always" button is not working"

* commit 'd6d7587ab09e4a0eae9252e11ab59ad27af68823':
  Activity chooser "Always" button is not working