Merge "Include JDK with STS SDK like the other *TS suites." into sc-dev am:...

Merge "Include JDK with STS SDK like the other *TS suites." into sc-dev am: f318e46c am: f535a00c am: a5fa8872 am: 57e2bd72 am: 1718fef0 am: 0e81002b

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20950851



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