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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I740131a0a906356582e6ab1264ec135bba2a788e