Merge "Use device SKU for Build.SKU instead of product/odm SKU" am: d1acd32722

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

Change-Id: Ida9865813088b5b1c6a0d0a728acb93dbe75cfda