Merge "init: Log more information if stopping times out" am: 1b2d4436 am:...

Merge "init: Log more information if stopping times out" am: 1b2d4436 am: aba99a9a am: 04760de7

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



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