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

Change-Id: I858adab5e961a1c58c942ee53445d3489c1ff11d