device_replacement changes: Better segmentation for Android; Samsung; So...

...nyEricsson; Chinese Manufacturer(s); For each change a testcase was added.