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

Change-Id: Ia1033655a1cba583a3ef23d94380471571875720