Merge "servicemanager: startup log" am: 2f47fec948 am: 0fffa4dfb6

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

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