Merge "Remove the prefix "Model:" from the summary of hardware." into rvc-d1-dev am: e86dd271 am: e9a33d48

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12034261

Change-Id: I50d3e9d474d87218e0ee687c5e8159e7afbaf626