Merge "Add new diagnostics feature key" into tizen

diff --cc emulator/model-config.xml
Simple merge

diff --cc emulator/model-config_mobile.xml
Simple merge

diff --cc emulator/model-config_mobile64.xml
Simple merge

diff --cc emulator/model-config_tv.xml
Simple merge

diff --cc emulator/model-config_tv64.xml
Simple merge

diff --cc emulator/model-config_wearable.xml
Simple merge

diff --cc generic/model-config-iot.xml
Simple merge

diff --cc generic/model-config.xml
Simple merge

diff --cc rpi3/model-config.xml
Simple merge

diff --cc rpi3/model-config_tv.xml
Simple merge

diff --cc tm1/model-config.xml
Simple merge

diff --cc tm2/model-config.xml
Simple merge

diff --cc tw2/model-config.xml
Simple merge

diff --cc tw3/model-config.xml
Simple merge

diff --cc xu3/model-config.xml
Simple merge

diff --cc xu3/model-config_ivi.xml
Simple merge

diff --cc xu3/model-config_tv.xml
Simple merge