Merge "init: Fix and re-enable the init#StartConsole test" am: 7bc5a7ef5f

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

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