[automerger skipped] Merge "Validate config activities with their rule owners" into rvc-dev am: 316cd96b28 -s ours am: 25aa1f617d -s ours am: 32e60479ca -s ours am: d1c0e2151c -s ours am: 1d2a59d59c -s ours am: b93ced51af -s ours

am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 65b18b5e69 is already in history

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

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