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

Merge "Move product string definition" into tm-dev am: b0939614 am: 0af27585 am: 0921b929 am: 6a87966f

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



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