Merge "Remove unused import of ServiceManagerNative." am: 9958d0da90 am: 9a67b9d69e
am: c33f3327aa

Change-Id: I988f0ff621c4792ef4c1bc15360fe091239f4431