Merge "Remove redundant NetworkStackDevApiLevel target" into main