Merge "Fix preference screen title to make folded devices the same as phone"...

Merge "Fix preference screen title to make folded devices the same as phone" into tm-qpr-dev am: 5809508f am: a36f89aa

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



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