Merge "Replace source based system server stubs" am: e93cf9e566 am: fef2035b4f

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

Change-Id: I7cb9f20139da99292954aa42985d1a7fcb1dc78e