Merge changes from topic "refactor-init-servicelist" into main am: efbc08e0ce am: 56fd9e2830

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3234865

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