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

Change-Id: I1bb1e6ccd21aa9e1fb15ca209a18edb612beabb8