[automerger skipped] Merge "Fix the potential NPE when calling IPMS API and...

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

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

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

Change-Id: I3d2aba5417bec45b7bfb0a66f0b43d0dd4ccc974