[automerger skipped] Merge "Rename PhenotypeHelper to DeviceConfigHelper" into qt-qpr1-dev am: f924933058
am: 4b63818b1f -s ours
am skip reason: change_id I5d9edf518b92f48d73e2ed5d142a162d348d24ba with SHA1 2f3a476b23 is in history

Change-Id: I63eca6dae6adf399249973dea98eab5fbd4e3e37