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

Change-Id: Ic7c2ae706daa0aefd8a18332f9ec8afcf84d01de