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

* changes:
  [automerger skipped] Merge "Allow windowhandles with NO_INPUT_CHANNEL - DO NOT MERGE" into sc-dev am: 201f54d7 am: f076e073 -s ours am: 034f4efd -s ours am: 452bd0d9 -s ours am: fbc4c318 -s ours
  [automerger skipped] Allow windowhandles with NO_INPUT_CHANNEL - DO NOT MERGE am: 4c0e4319 am: 4563b6a2 -s ours am: 7052ac03 -s ours am: db014e30 -s ours am: bf1d7e90 -s ours