Merge "Delay the removal of support of ScriptC from TargetAPI 35 to 36" into...

Merge "Delay the removal of support of ScriptC from TargetAPI 35 to 36" into main am: a663e278 am: 72bcb498

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



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