Merge "services: Dont statically include classes in bootclasspath" into main...

Merge "services: Dont statically include classes in bootclasspath" into main am: ce9b8fa2 am: 332ae518

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



Change-Id: I1d13084624f227b82f6e68080bde8e4d2c5eff78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>