[automerger skipped] Merge "DO NOT MERGE Fix Emulator not emitting folding...

[automerger skipped] Merge "DO NOT MERGE Fix Emulator not emitting folding features." into sc-v2-dev am: c7dada96 am: df6fc649 -s ours am: c3cf5216 -s ours am: 8beb7345 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17342980

Change-Id: I116f48f0455542d6138f49436a588d132c94dd5a