Merge "Add support for a product name as well as title." am: bcb81e74 am:...

Merge "Add support for a product name as well as title." am: bcb81e74 am: f3dce12e am: 75099787

Original change: https://android-review.googlesource.com/c/platform/build/+/1973030

Change-Id: I7446544d2dfdac2b39f5272aa09a0d6095dfeefd