Merge remote-tracking branch 'origin/wjc' into wxr0114

wxr

2022-03-11 4a9844ac95e2ff67b2a2b1082c30f15c561866c6

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