Merge "Address API feedback on SKU/ODM_SKU" am: 599f545969 am: 210b7a542b am: 5c9c0e7622

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

Change-Id: If53f5ea849f8d00bd1984f4740ddbd4350931561