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: Ifaba2fc354d45d293d23cab526376ed735fce740
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>