[automerger skipped] Merge "Use -Xjvm-default=all instead of...

[automerger skipped] Merge "Use -Xjvm-default=all instead of -Xjvm-default=enable or @JvmDefault" into main am: 2e931873 am: e4de34bd -s ours

am skip reason: Merged-In I473e578b92482fbd6c8812c4d32acc1a4c27a84a with SHA-1 25a05fe4 is already in history

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



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