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