[automerger skipped] Merge "Merge "Restrict the smallest screen width dp of an...

[automerger skipped] Merge "Merge "Restrict the smallest screen width dp of an embedded TF" into tm-dev am: e107722e am: 6bbb0bf8" into tm-d1-dev-plus-aosp am: b8872fe7 -s ours am: ed173be1 -s ours

am skip reason: Merged-In Ic085c6ed134c2787a26fd2b02b4345b04fb693e6 with SHA-1 73774c26 is already in history

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



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