Merge "Check network info for metering state on AccessPoint." into oc-dev
am: 73c04555ac

Change-Id: I85bd2269bac0cd072d06a036e09f6aea924da6ba