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

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

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



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