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

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

Change-Id: I8d777a76eeacbf351837a70653fdef0f0b91316e