Merge "Require root for StartConsole Test" am: 76607e5b07 am: 5433d7db5c am: eb0ce2a22f

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

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