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

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

Change-Id: Ic4a9a3a7ded5e0b3d498fcb8da66b1fe2b88a11f