[automerger skipped] Merge "Add method to reset network types" am: 96d59d75 am: 35287e4b -s ours
am skip reason: Change-Id Ia6eaba4e40fe47e79f8a7b6bcbadc61151d84823 with SHA-1 a59764ed is in history
Change-Id: Ib3909b1402a5db650ef8f833ff8f542c213f77ae