[automerger skipped] Merge "Use -Xjvm-default=all instead of -Xjvm-default=enable or @JvmDefault" into main am: 2e93187332 am: e4de34bd6c -s ours am: 3bfc21bea8 -s ours
am skip reason: Merged-In I473e578b92482fbd6c8812c4d32acc1a4c27a84a with SHA-1 25a05fe4e3 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2662657
Change-Id: I49e9d576f341d0f26a613db86c1c0bb2821842ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: