Merge "Merge "Fix meteredness bugs in updateNetworkRulesNL()." into oc-mr1-dev am: 03a5cb51c8" into oc-mr1-dev-plus-aosp
am: f16c85de94

Change-Id: I0db230a2dcd633a782a7b5c9e341c84088970cfd