Merge "Fix b/282944866: Java crash" into udc-dev am: 0101e6904f
am: b6f257642c
am: 1c546b6fc4
am: 10f028f71a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23279578 Change-Id: I1a0f3f673c16ac408888ad3183b5ab44716cc0c5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: