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

Change-Id: Ibedc16800360be966fb3e47a802f58147775c461