Merge "Adding public API to expose DisplayInfo.deviceProductInfo" into sc-dev