Merge "Fix issue #10688644: Java crash in com.android.phone:" into klp-dev