Merge "Revert "Add RebootTargetPreparer for tests that require root permission"" am: 497fc636 am: e756941a am: 1d33e9ee am: 0d5cf747 am: c1ce32f8 am: 644f0432

Original change: https://android-review.googlesource.com/c/platform/packages/modules/DnsResolver/+/2331363



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