Merge changes from topic "presubmit-am-6493193fb96f4675a3f0727cb0aa9ffa" into sc-v2-dev-plus-aosp

* changes:
  [automerge] DO NOT MERGE Fix Emulator not emitting folding features. 2p: 98ca72c5f8
  DO NOT MERGE Fix Emulator not emitting folding features.