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

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

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



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