[automerger skipped] Merge "Add NETWORK_STACK_SERVICE to SystemServiceRegistry" am: 55962277bf am: c5dfc3ca1b am: 995211c840 -s ours
am skip reason: Change-Id I940c62064466c3b3b8d2a195b810e90eaade7e6c with SHA-1 05f7b5c621 is in history

Change-Id: Ic98add9164a47527068066eb1467d02d70477d71