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

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



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