Merge "servicemanager: startup log" am: 2f47fec9 am: 0fffa4df am:...

Merge "servicemanager: startup log" am: 2f47fec9 am: 0fffa4df am: 0e7a0b38 am: f98c3d0b am: 811a66a1

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



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