[automerger skipped] Merge "Prevent unnecessary waiting APN index reset" am:...

[automerger skipped] Merge "Prevent unnecessary waiting APN index reset" am: 43af3564 am: 099ed45e am: da64345f -s ours am: 3a42f16c -s ours

am skip reason: Merged-In Ia7e2c474c7ad13c016443390fa3db288342ff3dc with SHA-1 7e802d08 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1692374

Change-Id: I663de92e6233b9c6f6fb48c4f23d377b3898dc1e