Merge "Upgrade Spa to Java 17" into udc-dev am: 9e7ebc2c

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



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