Merge "Add constants for supplementary audio placement" am: f5ac336b1d am: 249b09ac23

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

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