[automerger skipped] Merge "The phone didn't reload the allowed Network Type" am: cfa02cd6 am: 3dd9c6bf am: 935980c7 -s ours am: 943570dc -s ours am: cc6c300b -s ours

am skip reason: Merged-In Icfffea3c74ecf6938455d841da9d6175f6aa07de with SHA-1 a71b2c61 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1641903

Change-Id: Id19f38de5ff19e380b5d29914145e1e41f813bb6