Merge "Fix getService should retry on DEAD_OBJECT"