[automerger skipped] Merge "[DON'T BLOCK] Test ownership migration rules" into main am: cca4e91fcf -s ours am: 79bb73b651 -s ours

am skip reason: Merged-In I7fbd55a92f4302a6e03bcff0283737fd9295165d with SHA-1 3f65505208 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2950590

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