Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc

WJC

2019-10-29 45e4e387f3ef259b9e225fdd543e20be285a5112

 ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml

old mode 100644
new mode 100755