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

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

Change-Id: I01563e75274c92667091643365dcb9a2cef60853