Merge "Remove service stub dep on default libs" am: 58095aa504

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

Change-Id: If85e1c609a7629491480bea4cd36893fd70c5ae7