Merge "Add services-stubs for in-process APIs in services.jar" am: 99d091ee81 am: 1c86d14d8f

Change-Id: I1cdf111222814288ada3ce6bfd57ec5d4e9e382c