Merge "API to get SOC manufacturer and model" am: a6b77e3294 am: 5fe83ca052 am: b5d864ee38

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2877e0aa0be6621b17932056f7d2f686b7964676