Merge "AudioSystem: fix "keep in sync" comments" am: c1370378

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



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