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

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

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