[automerger skipped] Merge "Add enforceNetworkStackOrProfileOrDeviceOwner()" am: 209025caac am: 016f07c498 -s ours am: f8f5001b86 -s ours

am skip reason: Change-Id I3b7ddc2543e6b4754d6eaac128ca9a8ccea6b59c with SHA-1 826224dbc1 is in history

Change-Id: I448b5bf0781882b2f001b07f3dc08ec4cbc32a5e