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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib77e15b216e4e4c79b93586d5167bba92026aa29