[automerger skipped] Merge "Check allowed network type in Phone" am:...
[automerger skipped] Merge "Check allowed network type in Phone" am: ace0f200 am: e99a4bc2 -s ours
am skip reason: Change-Id Ie28d7b40bba7615de50b46cdc735002c965ba636 with SHA-1 260f9b33 is in history
Change-Id: I256f63598e1381db43ecbacb9d958c9b61813da0