Merge changes from topic "am-f84f92b539a04047959e42e80b6a8093" into tm-qpr-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: d1c0e215 -s ours am: 1d2a59d5 -s ours am: b93ced51 -s ours am: 9ba444a2 -s ours am: bb2aebbf -s ours
  [automerger skipped] Validate config activities with their rule owners am: b161a3b8 -s ours am: 812e171b -s ours am: fbcc4a9e -s ours am: 8e4337e3 -s ours am: 85e39e89 -s ours am: 250f8e73 -s ours am: d07fc49e -s ours am: 70c15cf7 -s ours