Merge "AudioSystem: fix "keep in sync" comments" am: c1370378c7 am: 51ea8de9bf am: 541f1e2e7b

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

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