Merge "Add OBSERVE_NETWORK_POLICY for shell to test CTS"