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

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

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



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