Merge "Include JDK with STS SDK like the other *TS suites." into sc-dev am: f318e46c60
am: f535a00c39
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20950851 Change-Id: I35b162b5120202b6d84f95c5d29889fe49858a4b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: