Merge "IServiceManager: Improve getService responsiveness in absence of service am: 3b36bcf703 am: a52c368fe2" into nyc-mr2-dev-plus-aosp
am: 32c1e8e05c

Change-Id: I80555127ebd7f9e430692cd5222166af96547553