am 2e47a2c8: am 744cdf57: am b6d3c1ce: Merge "Make AudioPackage10 (N4) more like AudioPackage12_48 (N5)" into klp-dev

* commit '2e47a2c871e99eb89b3ffe6062cdd8740a954fdc':
  Make AudioPackage10 (N4) more like AudioPackage12_48 (N5)