Added Android lock/unlock feature
Merge pull request #3638 from 0x1mason/unlockDevice

Added Android lock/unlock feature: #3342 Fix
Use UICatalog.zip from appium/sample-code
Merge pull request #3658 from bem/feature/reset-fix

Fix reset.sh by using UICatalog.zip from appium/sample-code
Simplify getDeviceType()
Rewrite unit tests for getDeviceType()