Merge "Add ability to automatically bootup" am: 1295d2e8bb am: 77c8fc54ef

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

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