am 5dfa7c1b: Merge branch \'lmp-mr1-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/av into lmp-mr1-dev-plus-aosp

* commit '5dfa7c1b':
  Fix AAC recording issue