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

tzy

2021-06-09 884b594a7171a496609299c9c535e04c32316bb8

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