[automerger skipped] [MP01] Add configuration to support multiple probes am:...

[automerger skipped] [MP01] Add configuration to support multiple probes am: a64bb706 am: 4f85628f am: cd9e0e5c -s ours

am skip reason: Change-Id Ib2c1d16d2088ef043cdc6f9cb323a9df552beefb with SHA-1 a64bb706 is in history

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

Change-Id: I5ad73044517040ef25e1af1fd2c6d0e1a8e1f6a6