[automerger skipped] Merge "Add enforceNetworkStackOrProfileOrDeviceOwner()" am: 209025ca am: 016f07c4 -s ours
am skip reason: Change-Id I3b7ddc2543e6b4754d6eaac128ca9a8ccea6b59c with SHA-1 826224db is in history
Change-Id: I4ad1a12d04c5b51a36b42277979734a3b3385937