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

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



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