servicemanager: remove move check TODO am: cd551fab41
am: dd5952a48f

Change-Id: I55a5e6d864b16b2a05052fcea7e4cb5c4b8835df