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

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

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