Merge changes from topic "am-9b966c8d70f44c9981900ad3e70dcafe" into main

* changes:
  [automerger skipped] Merge "De-flake testSystemDrivenInsetsAnimationLoggingListener_onReady" into tm-qpr-dev am: a44bc9ca -s ours am: 8cb2b57e -s ours am: 5677e065 -s ours am: 23de1717 -s ours am: bf5c50c1 -s ours
  [automerger skipped] De-flake testSystemDrivenInsetsAnimationLoggingListener_onReady am: c3dc5d58 -s ours am: 82aad5f3 -s ours am: 16bcc199 -s ours am: 860f60b5 -s ours am: feb204d4 -s ours
  [automerger skipped] Merge "DO NOT MERGE Revert "Revert "Fix vulnerability in AttributionSource due to in..."" into tm-qpr-dev am: e326cb83 -s ours am: c9656cf8 -s ours am: 2d39f490 -s ours am: 297b8c78 -s ours am: cdae30c0 -s ours
  [automerger skipped] DO NOT MERGE Revert "Revert "Fix vulnerability in AttributionSource due to in..." am: 53657da8 -s ours am: 46eaba13 -s ours am: d7366d64 -s ours am: ff717daf -s ours am: 9cb89dbe -s ours