Merge "NetworkPolicy gets updated due to CarrierConfigManager updates." into oc-dev