[automerger skipped] Fix MixedDeviceOwnerTest test failure am: 82ab73b416 -s ours

am skip reason: Merged-In Iba8a2004a58a4d440a0c62c59ae89b5e4ca1253c with SHA-1 5f1e492e15 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26618815

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