Merge "services.core: use java_genrule_combiner" into main am: b1731cea am: 354751cf

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



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