am adfbc5b2: am 8a0d133c: Merge "Make AudioPackage11 (N7 v2) more like AudioPackage12_48 (N5)" into klp-dev

* commit 'adfbc5b25559392ce40abb75df2cd8858dcd8835':
  Make AudioPackage11 (N7 v2) more like AudioPackage12_48 (N5)