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

* commit '744cdf57e60aadc697ecc12effda789482b96982':
  Make AudioPackage10 (N4) more like AudioPackage12_48 (N5)