[automerger skipped] Merge "DO NOT MERGE Fix Emulator not emitting folding features." into sc-v2-dev am: c7dada96bb am: df6fc64952 -s ours am: c3cf521667 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17342980 Change-Id: I06128567301c6d4c15aecce088165461f49fca50
This commit is contained in: