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

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

Change-Id: I7208c8e14772a8b5ef5c090fb3913973d9350a3a