Merge remote-tracking branch 'origin/wjc' into Dev-Wxr

wxr

2023-04-11 87bc1140ac4a1dc3e46a322444a80a9ce321b57d

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