am b32505ed: am 15a4b306: Merge branch \'lmp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-dev

* commit 'b32505ed5945fde278924c374ff90f8b8e5b67bb':
  Make AudioState constructors public