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

* commit 'e9aad4ae31caeb00f95d83119c2020f4cb5f345c':
  Fix issue #10688644: Java crash in com.android.phone: