Merge "Make the tests permissive for Q set changing 1 << 20 to a value that would never reasonably be used for an extension APN type bitmask Bug:135512687 Test: cherry picked from partner CL" into qt-dev