Merge "Merge "Extract unfold classes to a separate library" into tm-qpr-dev...

Merge "Merge "Extract unfold classes to a separate library" into tm-qpr-dev am: 3676e7af" into tm-qpr-dev-plus-aosp am: c289c56b

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



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