Merge "Merge "Fix version code pattern for NetworkPermissionConfig" into qt-dev am: 7fe96e5e" into qt-dev-plus-aosp