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

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



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