Merge "Changed the onQualifiedNetworkTypesChanged API" am: aa08473294
am: 8141dd8938

Change-Id: I6198723cb22f3338c4743c8ec9af294cfdcf86fe