Merge changes from topic "am-53a777bd7e4e44da8f96a18f5a2dd4fb" into udc-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE: Drop invalid data." into sc-dev am: 976b1f8c -s ours am: 2bfd26b2 -s ours am: 99114aeb -s ours am: 2fe19fd3 -s ours am: 235a44e8 -s ours am: 23f1d3e3 -s ours am: 5c89651c -s ours am: 58ca058d -s ours
  [automerger skipped] RESTRICT AUTOMERGE: Drop invalid data. am: 0e0819c9 -s ours am: 5fbfe41f -s ours am: 8fa5c1fb -s ours am: c630b362 -s ours am: 05a09b27 -s ours am: 85260a49 -s ours am: 13b493db -s ours am: 60073e1b -s ours