Merge "Fix getService should retry on DEAD_OBJECT"
am: 8476eb8f90

Change-Id: Ic5da2cca3292e3d3ed832acc41c2212fe68ba525