Merge "Add product variants for unicorn strings." into tm-qpr-dev am: f9e992f4

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



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