Merge "Remove service stub dep on default libs" am: 58095aa5 am: 4a55da60...

Merge "Remove service stub dep on default libs" am: 58095aa5 am: 4a55da60 am: 3b7d9c46 am: 04083d6c

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

Change-Id: I9f86f927dac9f23e479053cdaf7f876169abc099