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

Merge "Move product string definition" into tm-dev am: b0939614 am: 6371d59c am: f5762c25 am: db7906ff

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



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