[conflict] Merge "Reset isFoldHandled" into tm-qpr-dev am: d926222a am:...

[conflict] Merge "Reset isFoldHandled" into tm-qpr-dev am: d926222a am: 157ea6d3 am: b50d146e am: 95adad79

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



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