[automerger skipped] Merge "Change the API to check if a surround format is...

[automerger skipped] Merge "Change the API to check if a surround format is enabled" am: eae2d15e am: daace557 am: 329a2d59 -s ours

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

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



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