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

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

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