Merge "Add another property for the ODM SKU (ro.boot.product.*)" am: 9b432d22a4 am: 42f9775b38

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I42fe01edc55ca20afe9ff9761dc55be625b418ab