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

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



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