[automerger skipped] Add support for max-target-s am: 22f34b3769 am: 24d0a8c89c -s ours am: 795383b5a3 -s ours am: 132933e10f -s ours

am skip reason: Merged-In I3d7c32b18bb6b64d69632f0799aa48672b8712d7 with SHA-1 36c0cb0ed5 is already in history

Original change: https://android-review.googlesource.com/c/platform/art/+/2087007

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