[automerger skipped] Merge "Add services-stubs for in-process APIs in...

[automerger skipped] Merge "Add services-stubs for in-process APIs in services.jar" am: 99d091ee am: 1c86d14d am: d51df31c -s ours
am skip reason: Change-Id I027b8a22b3e7533f6203aabb9dc3f690e4e842a6 with SHA-1 abc72e45 is in history

Change-Id: I0b36cf3efa4865cb08fd0ce8a53b45d04a198d3c