[automerger skipped] Merge "Fix the potential NPE when calling IPMS API and ExecutionException is thrown." into rvc-dev am: f6d4760cd5 am: 95f08e0ff9 am: fecc0bfbd6 -s ours

am skip reason: Change-Id Ib46624c76c2c1e50c73ccfbb295a0e90e6fa1c88 with SHA-1 65435e2810 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11882394

Change-Id: Ie47efe1be79b360a856aa0c0bf817f12316922a8