Merge "NetworkPolicy gets updated due to CarrierConfigManager updates." into oc-dev am: 334220984e
am: 7b7c8f23d2

Change-Id: I6eea29b4b18f1ed53de557c79a81f9fc59770f50