[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 -s ours am: 4f8821a7 -s ours am: 0d389d6a -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: I97165ca857e2a5f32f9bda4b13116458def8263c