[automerger skipped] Merge "Fix permission issues for network update service"...

[automerger skipped] Merge "Fix permission issues for network update service" am: 1aed0289 am: f240a52f am: 0dd68fdb -s ours

am skip reason: Merged-In I8a34c801d82c769fd8d06e5b0b3177ce92b5f072 with SHA-1 bdf7b5dc is already in history

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



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