Merge "Adds CHRE platform ID to ContextHubInfo"