Merge "Fix emulator not emitting folding feature." into tm-dev am: dbda026b

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



Change-Id: I4e098a82fb43248f786b74bac4d64658b85fb095
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>