Add support for max-target-s am: 36c0cb0ed5

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

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