[automerger skipped] Merge "Fix MixedDeviceOwnerTest test failure" into...

[automerger skipped] Merge "Fix MixedDeviceOwnerTest test failure" into 24D1-dev am: 99db69ac -s ours

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

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



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