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

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



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