Merge "Disable the AppOp Restriction for IpSec Tunnels" into stage-aosp-master
am: bda7c96038

Change-Id: I98f2a964b3035daf93b54dc2b72561b16d2ded92
tree: 2e603cef8073a735fa1ad45d1bbcc3d48aada490
  1. core/
  2. services/
  3. tests/