[automerger skipped] Disable userspace reboot am: 747ec292de am: 8a3fb3c25a -s ours am: a42b3935ac -s ours

am skip reason: Change-Id Ib6ff4c7c3dcd9172306cca0eb7615a485153ec29 with SHA-1 6496116e47 is in history

Original change: https://android-review.googlesource.com/c/device/google/wahoo/+/1360563

Change-Id: I6ed72445e90be4b3ee9badd304bbe19e3c5df044