Merge changes from topic "am-c912ebbb4b2e4d4a989f68e5d69b4df0" into tm-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Validate config activities with their rule owners" into rvc-dev am: 316cd96b -s ours am: 25aa1f61 -s ours am: 32e60479 -s ours am: cca0ff1d -s ours am: bb5fbb65 -s ours am: ab049196 -s ours
  [automerger skipped] Validate config activities with their rule owners am: b161a3b8 -s ours am: 812e171b -s ours am: fbcc4a9e -s ours am: 97316ad3 -s ours am: d5b6cb2e -s ours am: b8870fa4 -s ours