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

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

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



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