Revert "getService should retry if getting nullptr" am: 2f7abc9a96
am: 91af7dbc31

Change-Id: Ia47db3b253afbedf2145794c12d88a5aaf05e7ec