am ccb7a9af: Merge "Prevent ChooserActivity from taking over the system bars" into lmp-mr1-dev

* commit 'ccb7a9af271836fde98636d9ce6ebbda09eb0158':
  Prevent ChooserActivity from taking over the system bars