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

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