[automerger skipped] Merge "The phone didn't reload the allowed Network Type" am: cfa02cd687 am: 3dd9c6bf01 am: 935980c740 -s ours
am skip reason: skip tag Change-Id Icfffea3c74ecf6938455d841da9d6175f6aa07de with SHA-1 a71b2c613c is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1641903
Change-Id: I875637d1c8cf3555f04bb29063a677cb5a6fb85e
This commit is contained in: