Merge changes from topic "am-154b2a8fe9ea4681a4ac0d29cc4a2d11" 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: 2e74a847 -s ours am: a36b4b4b -s ours am: 202bbc75 -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: 85a3b309 -s ours am: fd9b54d4 -s ours am: 2cb311e6 -s ours