Merge "Fix permission issues for network update service" am: 1aed0289 am: f240a52f

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



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