Merge "Revert "Update AudioFormat setChannelMask comment"" into main am: 5908942bed am: 713b52e462 am: dd22832162 am: f09d2cfa2f am: d24a97abdf

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

Change-Id: I5652e2667291dd51528ba31b2ff12630998aee45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>