Merge "Fix NPE when using hinge split type without FoldingFeature" into tm-qpr-dev am: 14a06a9c

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



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