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

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

Change-Id: I03831287fb050c5ed536714d15085fd6efb09d2b