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

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



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