[automerger skipped] Merge "[Settings] Prevent crash from abnormal behavior...

[automerger skipped] Merge "[Settings] Prevent crash from abnormal behavior for ApnSettings page." am: 53f081be am: 6ff7306d -s ours am: 6e24f125 -s ours

am skip reason: Merged-In I179c708debcbc31ba9a93e4e434ae810051f5004 with SHA-1 a2402aba is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1753980

Change-Id: I625106b3de67c27d0bd11f22cc9f6c17f5e0af36