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

Merge "services: Dont statically include classes in bootclasspath" into main am: ce9b8fa2 am: 058b2555

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



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