[automerger skipped] Merge "Fix NPE when using hinge split type without FoldingFeature" into tm-qpr-dev am: 14a06a9cd5 am: bd2c9c2e41 -s ours
am skip reason: Merged-In Ibb826c25f072cdffd5b5adcd19571fe446d64f51 with SHA-1 a296b769b2 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22339022
Change-Id: I33fee4397283338140bffd5bc1062d6235987667
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: