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

Merge "Fix flaky tests by require root for minadbd_tests" am: f820e627 am: d66516ea am: bc606682 am: be7f315c

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

Change-Id: Ie2a694be2789d3e5e14f052e78566235a1e73104