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

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

Change-Id: I21ecac025395c23702ee59e93a72b50326798d8d