[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: 4e3d8f9e

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



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