Merge "Fix flaky tests by require root for minadbd_tests" am: f820e62701 am: d66516ea7c am: c5a1b2af59 am: 30818876f1 am: 2e85b6f035

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

Change-Id: Idf1330824d3e6763efa2f7fb6cb5b9a227d7c595