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

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



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