[conflict] Merge "[PATCH] Revise instructions for "Remove device owner" related tests" into android12-tests-dev am: 1a0a645f53

Original change: https://android-review.googlesource.com/c/platform/cts/+/2225601

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