Merge "Add platform-systemserverclasspath." am: 61f27d7d52

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

Change-Id: Ie9a3878a9945b04b07c44b3970384dc96411abd4