Merge "Default compressed audio bytes per sample to 1" am: aa2884ac69 am: ce94c11c87 am: 313ffe6d31

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1444316

Change-Id: I944e555922d1c1acdd2f196cb4e11b532fe8a507