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

Change-Id: I92ad0d3c648fbb1756620ccb70e87369d2ba9594