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 am: 5661b647

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



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