Merge remote-tracking branch 'origin/CJL-LC' into wxr4

wxr

2021-07-01 8ac39f2f962329f30ee61ee8a7abe6d6b5940dd5

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