Merge "Adding product string variants on choose lock page" into tm-qpr-dev am:...

Merge "Adding product string variants on choose lock page" into tm-qpr-dev am: a301ba8a am: 40fccabd

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



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