Revert "Fix Runtime Restart caused by ag/1370419"

This reverts commit 2a9c8874708814ffb80aaa48b63dd7179de0a69a.
Not needed in M

Change-Id: I7d0dd6e2382e62d55001851244433b5c3b562078
1 file changed
tree: 7f18ffff4a26507372656c3f344e9e92e7a10da8
  1. service/