Merge "Add platform-systemserverclasspath." am: 61f27d7d am: 0fd596fd am:...

Merge "Add platform-systemserverclasspath." am: 61f27d7d am: 0fd596fd am: b26407be am: 4f2e331f

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

Change-Id: I7aa473dfe72feb868f42a6449d3395b0afe4f950