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

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

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