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

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

Change-Id: I25b9583313dedf268733fd6b22536cd000b0504c