Merge "Make sure to reset isFoldHandled" into tm-qpr-dev am: 921756c9 am: 1f8b899e

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



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