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

[automerger skipped] Merge "Restrict the smallest screen width dp of an embedded TF" into tm-dev am: e107722e am: 6bbb0bf8 am: 6989cabf -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: I6a253f1748f1faa0511306f61c980312da5e1792
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>