Merge "Fix flaky tests by require root for minadbd_tests" am: f820e62701 am: d66516ea7c am: bc606682d2

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1409248

Change-Id: I575b28ea2a279d08895416570216c571263405cc