getService should retry if getting nullptr
am: 64ba3d7987

Change-Id: I43f2fcaa9d0a7543d3f0ad209cf17f49b240c301