Merge "servicemanager: startup log" am: 2f47fec948

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2147382

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