[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: cc7b25a3 -s ours am: 1a3a24bf -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: I5cb14176b40f289bf350fdc9fbcaa6ec1a021b08