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

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



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