Merge "Remove service stub dep on default libs" am: 58095aa504 am: 4a55da60f0 am: 3b7d9c468f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1368337

Change-Id: Ia383f987fb0b84c4285a5c999aab804e5cc5e3a9