Merge "Fix an issue that the FoldStateListener induces a memory leak" am: 4dd1477d72 am: fa87ee6feb

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

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