am d22e6d0b: am 0dc2b81c: Merge "Cleanup internal status bar APIs." into jb-mr1-dev

* commit 'd22e6d0b50ba293511352d6d05be33f535b75666':
  Cleanup internal status bar APIs.