Merge "Don't skip falsing on non-foldable devices" into tm-qpr-dev am:...

Merge "Don't skip falsing on non-foldable devices" into tm-qpr-dev am: 55940174 am: 1bb62753 am: df5bd760 am: a3ac3dc5

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



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