Merge "Add enforceNetworkStackOrProfileOrDeviceOwner()" into rvc-dev am: 9f5f4d3b84

Change-Id: Ieef52a35d6580fae058a4a1e8712ba3711b8e422