[automerger skipped] Merge "Increase the upper limit of slang target API to 31." am: 12ec298d1d am: 8e5393a36e -s ours

am skip reason: Merged-In Ib16b9750c246c3e7c5827a2730ad9b71ff5aa847 with SHA-1 5ad64063ee is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/compile/slang/+/1708251

Change-Id: Ic74e2a5c355cecd3f43445c9f74d738b42a8a50b