Merge "Don't report non-foldables as unfolded." into tm-qpr-dev am: b1f2fb99...

Merge "Don't report non-foldables as unfolded." into tm-qpr-dev am: b1f2fb99 am: 5e06db80 am: 49ef1d5d am: ce3b1c0d

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



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