Merge branch 'CJL'

wxr

2020-11-20 387383a243879bf8c63a4611e2ed2c5a519e218d

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