Merge branch 'dev-tzy' into temp-wxr

wxr

2021-03-09 134811c790a982d505567e2ba69b5de566410367

1
2
3
4
<?xml version="1.0" encoding="utf-8"?>
<network-security-config>
    <base-config cleartextTrafficPermitted="true"/>
</network-security-config>