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

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

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