Merge "Revert "[User Manager] Add NETWORK_STACK permission."" into tm-qpr-dev am: 8ad9016b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19716469



Change-Id: I471172de1d917b03f4d56997189b92b6d421d021
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>