[automerger skipped] Merge "Replace allowedNetworkTypes with allowedNetworkTypesForReason" am: 6775f40664 am: 29594edb70 am: cc1715e2c0 -s ours
am skip reason: Change-Id I2b981569ad11cf70a558c1952cc2e077464328d8 with SHA-1 60c4163244 is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1614990
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If823671f456d27da7f701ca93e2f86fcf74a13bd
This commit is contained in: