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