[automerger skipped] Merge "Change the API to check if a surround format is enabled" am: eae2d15e64 am: daace557b7 am: 329a2d596e -s ours am: 52dbf89b71 -s ours am: fc5ce087cc -s ours am: 936be0db4e -s ours

am skip reason: Merged-In Ife24353fddff2ac36f948ff17c56de4c66cebbb5 with SHA-1 06946da093 is already in history

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

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