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

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