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

Change-Id: I29c87caa6c30d8f198e06318595a2c288b2fcfaf