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

Change-Id: Idf8a5c0121a875953d675cf95b1a48fd3fc2e0b2