Merge "Set restrict local network aconfig flag for 26q2 dates" into main