[automerger skipped] hwservicemanager: Make hwservicemanager in cpu foreground group am: 4bd958e941 -s ours

am skip reason: Merged-In I6298b11225c0768c7ff0e9bbbbe6a51e50dfecc5 with SHA-1 2d3441f50b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/hwservicemanager/+/14696029

Change-Id: I937e1382b9968adff860f2295cb4052f8d183436