Merge "Developer options should reflect the correct DeviceConfig value for ReleaseFlag." into main