[automerger skipped] Merge "Refactor to pass layout selection criteria to...

[automerger skipped] Merge "Refactor to pass layout selection criteria to Settings" into 24D1-dev am: 2d967b48 -s ours

am skip reason: skipped by vdevmurari

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



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