Merge "Change the API to check if a surround format is enabled" am: eae2d15e64 am: daace557b7

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

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