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

Change-Id: I5b2322d7cb4eac3dcc59b15564c4ebaf3a532737