Merge "Move product string definition" into tm-dev am: b0939614 am: 0af27585

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18171679



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