Merge "Add "smallestScreenSize" into homepage activities" into tm-dev am:...

Merge "Add "smallestScreenSize" into homepage activities" into tm-dev am: e058aae3 am: a0ebaf2b am: 4f31518c

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18841360



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