Merge changes from topic "refactor-init-servicelist" into main am: efbc08e0

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



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