[automerger skipped] [automerge] DO NOT MERGE Fix Emulator not emitting folding features. 2p: 98ca72c5f8 am: fac09ad9ab -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ibc1183be890c9cbd56fd919cddcb55c1a949de39