commit 013a1810f41e86a01395b589601e845dd63a4e81
author Chris Manton <cmanton@google.com> Mon Nov 07 23:26:49 2016 -0800
committer Chris Manton <cmanton@google.com> Mon Nov 07 23:27:45 2016 -0800
tree ee0f4003ca383c368e2abeab1b1cc26aec368815
parent 9d469d0ceec6c79724fe0629399a6d9eb10d2900
parent 89b2b0d039e688298fb92a5072453cb8f50271e0

resolve merge conflicts of 89b2b0d to master

Test: Run on Nexus6P
run cts --skip-device-info -m CtsHostsideNetworkTests -t com.android.cts.net.HostsideRestrictBackgroundNetworkTests#testDozeModeMetered_enabledButWhitelistedOnNotificationAction
run cts --skip-device-info -m CtsHostsideNetworkTests -t com.android.cts.net.HostsideRestrictBackgroundNetworkTests#testDozeModeNonMetered_enabledButWhitelistedOnNotificationAction

Change-Id: I63a08f5fd0111e183411324ceb53e66fab254222