[automerger skipped] Merge "Get FoldingFeatures only when needed" into...

[automerger skipped] Merge "Get FoldingFeatures only when needed" into udc-qpr-dev am: 15e79656 am: 136b0565 -s ours

am skip reason: Merged-In I05394fcdb3dd637713fe37a2ee188e0d9c298cf6 with SHA-1 c25fb50d is already in history

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



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