Merge "Fix issue when preference screen title won't change depending on the...

Merge "Fix issue when preference screen title won't change depending on the device.." into tm-dev am: 1460a6a0 am: cb406595

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



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