[automerger skipped] Merge "Validate config activities with their rule owners"...

[automerger skipped] Merge "Validate config activities with their rule owners" into rvc-dev am: 316cd96b -s ours am: 25aa1f61 -s ours

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

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



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