[automerger skipped] Re-add check for metered APNs regardless of IWLAN am: 5e9632cd -s ours
am: 2b993cf0 -s ours
am skip reason: change_id I8cf8fe8f75889029db2c6d4ad945dcc79ab3fed6 with SHA1 db5d0dca is in history
Change-Id: I18f55a6259b4af2c29c0469d5e24767e14ceb706