Update ApnCarrierIdTest to update all APNs that match the criteria. This CL also increases the timeout to wait for data connectivity changes from 10 sec to 15 sec to reduce flakiness.

Specifically, this handles the case where you have multiple APNs with the same name, protocol, bitmask etc but different mvno_match_type or other fields. In this case, we'd delete all of the matching APNs, but the test expected to only delete one. We now delete all matching APNs for the test and restore them after the test.

Bug: 372122158
Flag: TEST_ONLY
ABTD: https://android-build.corp.google.com/builds/abtd/run/L99900030008896723
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6a46860d6e4060ef0d170521ce3c28d5004df4a9)
Merged-In: I67aff50ab1b8cae2c20c127b905894341088ab51
Change-Id: I67aff50ab1b8cae2c20c127b905894341088ab51