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

Merge "AudioSystem: fix "keep in sync" comments" am: c1370378 am: 51ea8de9 am: 541f1e2e am: d154307d am: 04f1bff0

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



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