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

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