Add support for max-target-s am: 2ea954fdf7 am: 41e6dd090f

Original change: https://googleplex-android-review.googlesource.com/c/tools/platform-compat/+/18164346

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