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

Change-Id: I48d20978f1382f0c053ffd83ad772fa4b6b5cf1a