Merge "Address API feedback on SKU/ODM_SKU" am: 599f545969

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

Change-Id: I77905b5632210a740895fef19090bd31e7a8c7c7