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

* commit '15a4b30652b797bf8e1997d85627b345de198813':
  Make AudioState constructors public