Merge "Add enforceNetworkStackOrProfileOrDeviceOwner()"