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

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

Change-Id: I84081d7182a3e2d2619d1b6578ba2dd8f3630936