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

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

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