Merge "Fix b/282944866: Java crash" into udc-dev am: 0101e690

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23279578



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