getService should retry if getting nullptr am: 64ba3d7987
am: d5749ed112

Change-Id: I03b98bb48cdfece7fd56b2aeb89d7683448566e6