Merge "Connect and enable root before running each testcase" into main am:...

Merge "Connect and enable root before running each testcase" into main am: b03384d4 am: 60c70263

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3501231



Change-Id: I91e57e73653654414e737413a5d5dc4bff047925
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>