Merge "Fix the side effect of `adb shell dpm set-device-owner`" into main