Merge "Add enforceNetworkStackOrProfileOrDeviceOwner()" am: 209025caac

Change-Id: I49f3f78dde8c0ab327709e484f05d7e2b53c0b43