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