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

Change-Id: I4458f58bb81fda29f97cf9efa403e14c24021e07