Merge "Make sure to reset isFoldHandled" into tm-qpr-dev am: 921756c9 am: bb375098 am: d93c04af am: ac609f69 am: e9cd2596

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



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