Merge "Remove service death test." am: 42542b5715

Change-Id: I0369512d0682c44043687ae6ee0db48fd910a5de